merge trunk
authorKenichi Handa <handa@etlken>
Thu, 1 Jul 2010 06:26:36 +0000 (15:26 +0900)
committerKenichi Handa <handa@etlken>
Thu, 1 Jul 2010 06:26:36 +0000 (15:26 +0900)

Trivial merge